From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 6 Dec 2005 13:29:07 +0000 (+0000)
Subject: Lazy initialisation of wgProxyList
X-Git-Tag: 1.6.0~1004
X-Git-Url: http://git.cyclocoop.org/%22.%24match%5B1%5D.%22?a=commitdiff_plain;h=e3a3e9bafc1a91e0a386ba9d955fd42e2f9bef19;p=lhc%2Fweb%2Fwiklou.git

Lazy initialisation of wgProxyList
---

diff --git a/includes/User.php b/includes/User.php
index 9e96e924be..0b47fa84b4 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -374,7 +374,7 @@ class User {
 	 *  master.
 	 */
 	function getBlockedStatus( $bFromSlave = true ) {
-		global $wgProxyList, $wgEnableSorbs, $wgProxyWhitelist;
+		global $wgEnableSorbs, $wgProxyWhitelist;
 
 		if ( -1 != $this->mBlockedby ) {
 			wfDebug( "User::getBlockedStatus: already loaded.\n" );
@@ -406,7 +406,7 @@ class User {
 		if ( !$this->isSysop() && !in_array( $ip, $wgProxyWhitelist ) ) {
 
 			# Local list
-			if ( array_key_exists( $ip, $wgProxyList ) ) {
+			if ( wfIsLocallyBlockedProxy( $ip ) ) {
 				$this->mBlockedby = wfMsg( 'proxyblocker' );
 				$this->mBlockreason = wfMsg( 'proxyblockreason' );
 			}